Fixed issue #2147: Resolve not dealing correctly with (modify/delete) conflicts

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>