visited violence upon the code to unbork my merge