last commit before movement reformatting