Merge conflicts around the conditions