changed first line
fixed merge conflict