* Fixed merge errors