Conflict solved (in a bad way)