Fixed merge again