Adds alias for viewing conflicting changes during a merge