This should work on mysql & mssql
Merge remote-tracking branch 'origin/master'