Fixed merge errors 2.0