Fixed James's merge rer