first blood
fixed first conflict