Do you have to commit merge changes for this?

Chris was here.