proactively preventing merge conflicts