solve uncommited changes