Git conflicts resolved