Trying to reduce merge conflicts or some wacky stuff like that