Delete works now.
Fixed git merge strategy to not discard entries from other computers.