edited the project
resolving conflict