fixes #17
Merging local changes with server side repo