removed conflicts line

popcorntime-bin & popcorntime-git already conflict with popcorntime
Merge branch 'xantares-patch-1'
Bumped popcorntime version