fixed merging errors

fixed merging errors