breaking up lines to avoid merge conflicts