A range of changes
resolved the merge conflicts