Resolve bluepill conflicts