previous commits are messed up.  :(

commit local changes before reverting to the correct state