add alias to easily merge changes from upstream