Final merge conflict resolved