corrected merge conflict