fixing error
fixed merge error