That was embarassing... Left merge markers in code.