Add integration specs for conflict resolution

This is a yak shave from the recent docs work