merge conflics resolved.