accept theirs and accept yours very flaky especially with deleted files

[0verEngineer]

Most of the time when i use accept theirs and accept yours it does not work properly. The conflict is not resolved sometimes, sometimes it works but it is still shown as conflict.