ignore dsstore
add different unit colors
moving only own unit works
conflict resolution
coffeeify
conflict resolution