modified first file
fixed merge conflict