Fix fudged merge conflict
Fix fudged merge conflict

hollomancer/operationcode_frontend,OperationCode/operationcode_frontend,sethbergman/operationcode_frontend,sethbergman/operationcode_frontend,hollomancer/operationcode_frontend,OperationCode/operationcode_frontend,sethbergman/operationcode_frontend,OperationCode/operationcode_frontend,hollomancer/operationcode_frontend