Fix Issue #5 - remove dup and merge changes
Fix Issue #5 - content merge from deleted file