Fix wrong conflict resolution, extra strings were added