Fixed merging fail