Two commits have been merged that need to be redone