Added aliases for merging and rebasing