adding changes
 fixing conflict