Add alias for resolving git conflicts with theirs version