Corrected merging bug.