further changes
try to remove file on server
used rm locally
test2
lets prepare some conflicts
file added
second try to merge
hm