Added alias to quickly make a fast-forward merge with upstream