added git alias for showing conflicted files