Trying to convince git that I'm resolving conflicts