Working out merging bugs