removed conflicts line

popcorntime-bin & popcorntime-git already conflict with popcorntime