Moved Merge Section to its own form
Merge branch 'master' of https://github.com/yianisn/typo