commit of project
fixed merge conflict