Fixed merge 2