uh oh stashing
fixed conflicts
misc edits to php and output gen to give only line number warnings