testing activegit
merge diff
merge conflicts ready for beta