Resolved page adding conflict
Fixed conflict
Fixed conflict

Or not. My git seems to be doing some strange things. Now fixed.
Merge branch 'master' of https://github.com/Desocrit/Scripting