Git & fixing conflicts