Create conflict and fix comments

Self explanatory
Merge conflicts

Whitespace and Maxima comment