Fixed merge problems