updating project structure, merge conflict resolution