Fixed merge alias for upstream