init project
resolve conflict