Fix post-merge messiness