adding changes
fixed merge