Git Resolve Conflict Using Theirs