Final merge conflict cleanup