init project
#1 remove conflict