Fixed merge things