fix conflict

diff --cc trouts
index eb7fee50c0ed3b2f84480ce897b963bb5b95b6c6,30847baecee51e0f64caa1a6ecc5df0ca33b86e1..c0d4d8cc4e85033c46f8b5ac01aef301e8a27f42
--- 1/trouts
--- 2/trouts
+++ b/trouts
@@@ -181,3 -182,5 +181,4 @@@ forces %s to listen to David Cameron's 
  sticks %s in a small room with Ian Paisley
  rains she-trolls down upon %s
  rains wheelbarrows on %s
 -nominates %s for the UK Usenet Committee
+ hits %s with a replica of Milan cathedral