Corrected merge conflict