Fixed other merging error