changed a line to create merge conflict