project set-up
fix conflict