Fixed errors in merge.