missed the 'merge' conflict stuff