Fix conflicts

README.md

@@ -43,11 +43,7 @@ Data is coming soon - everything is hand crafted and manually verified. Please,
 | peer2cloud | [proposal](./proposals/peer2cloud) | **SH** **AR** | |  +  |
 | polycryptoblog | [proposal](./proposals/polycryptoblog) | **SH** **AR** | **NA** |   +  |
 | pondsea | [proposal](./proposals/pondsea) | **SH** **EU** | **AR** **NA** |   +  |
-<<<<<<< HEAD
 | popcornbag | [proposal](./proposals/popcornbag) | **SH** **EU** | |   +  |
-=======
-| popcornbag | [proposal](./proposals/popcornbag) | **EU** **SH** | |  +  |
->>>>>>> 78086807170bfe0356e6831439becdd5c82228ed
 | ptyx | [proposal](./proposals/ptyx) | **SH** **AR** **NA** **EU** | |   +  |
 | rnr | [proposal](./proposals/rnr) | **AR** **NA** | **SH** **EU** |  +  |
 | shossain | [proposal](./proposals/shossain) | **EU** **AR** | |  +  |