Spelled out first line
FIXED CONFLICT <3