Fixed error in merge