commit before delete
fix conflicts