Fixed mistake while merging