project updated

updated and removed conflicts