Git conflicts resolved.