init project
fix merge conflicts