rm CardProj
new proCCB
solved conflicts