Attempt to reduce merge conflicts.