Before Rollback
fix conflict
commit project file