Fix rmuir's inadvertant commit of conflict info