Merge commit, resolve conflict