changed the first line
fixed merge conflicts