Update .project

fix merge issues