Fixed the merge issue