resolve merge conlicts