initial project setup
fixed conflicts