Fixed merge error contd