Fixed merge further