Adding git alias for listing conflicts.