fixed merge formatting - #134