Fixed merging bug