Fixed merge miss