init project
fix conflicts