completing file
solving merge conflict