Commit, then fix the problem due to branch switch;