Fix conflict resolution specs