Edit out backdoor, and fix a merge conflict.