merge attempt
conflict resolution