fix merge conflicts

adding compiled output back

default arg whitespace

doc fix