Fix merge conflict w/ git aliases