-Fixed merge problem