Master of merges

:shipit: