fixed merge changes
fixed merge changes