conflict detection, merging, etc should be done now, I think