haven't done anything but git
fixing conflicts