fancypants ls-colors
.
resolve conflict