brain fart
Resolve conflicts like a boss