diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -2,6 +2,10 @@ AUX anope.confd 319 RMD160 0c5d646bfa55a
 AUX anope.initd 575 RMD160 59f2759c0b3918f4d510c4f5f738dc40e079a511 SHA1 4669ee3d2eec9251b763438e0627f7152b5afc5a SHA256 bf510cb3eb2c9839630f834bc2730c6b4d3da9a7d9a671b02eefefad5f39ed1d
 AUX pid-patch.diff 450 RMD160 d18ab894895db105c91d0d1e24af2aff79f1bd13 SHA1 87be4165d15dbc6bfc972972d588e127ab492135 SHA256 cd3f266cd236e6a5bb7d15b502631e8992289455f7e308d94ac14e3b13314dc5
 DIST anope-1.8.0.tar.gz 1559446 RMD160 fc54c552de5bcfc1d3b620c442e4f5a7081734a3 SHA1 0e7106fd65c7dec4187fae26ac1ca6375fe694f1 SHA256 e0c03d2590d3da273e4fb2bb5ec8056f85045979f86e6224bfe895f16a1fd41d
+<<<<<<< local
+EBUILD anope-1.8.0.ebuild 4291 RMD160 4f65e94bda9416f8fe14cf640faa42c6c04630d0 SHA1 49b498963b263242dcfe4468600cef2140e7855b SHA256 dd95d53cbd4ecb563ca58c9968698b54a2d6288efcc40cbe1cbe249ed27cd0a0
+=======
 EBUILD anope-1.8.0.ebuild 4284 RMD160 b0caeea9896e3f3bbdb891e9df00874f641cba0e SHA1 b7015b938d8e5ac5e84fe888a518adfad936ef08 SHA256 497d6d53172a3dbdf313a06d70800a77522402073850b0a651af050cba56db15
+>>>>>>> other
 MISC ChangeLog 2512 RMD160 6f84a8905a5305da72de177e6d363de1ac98fffa SHA1 b6f4dea8590aa0d243989af07aae654a85ca1929 SHA256 64fa7722550962462d3cd5f9374446cecbb4bb0cceeadb9a789542a181ed5363
 MISC metadata.xml 467 RMD160 4d1ba922dab10abae80273bc1113710cd5c03702 SHA1 789db76ef094d3a024a17274428e736e456ec598 SHA256 3264e2596d73f5b371b1442dfb31892b557ac5fb795d7712ddf2d335d94bbd3e