Fix some conflicts
Fix some conflicts

Carson-Shook/bpm,Carson-Shook/bpm,ByzantineFailure/BPM-for-Discord,ByzantineFailure/bpm,Rothera/bpm,ByzantineFailure/bpm,Rothera/bpm,ByzantineFailure/bpm,ByzantineFailure/BPM-for-Discord,ByzantineFailure/BPM-for-Discord,ByzantineFailure/bpm,Rothera/bpm,ByzantineFailure/BPM-for-Discord,Carson-Shook/bpm