added a comment
gitmerge now properly writes/deletes files. prepared for testing