Fixed merge error contd 2