Add alias for merging upstream changes