Git accept all incoming changes merge conflict