Fixed merge issues 2.0