Corrected a merging error