Added alias for fixing git conflicts