Arrrrrrrrg
More granularity
merging and solving conflicts