Resolving conflicts from past merge