Laughing about the conflict
Resolved:wq the conflict