Remove merge conflicts when other groups push code