Re-add files delete when reverting merge

issue #73 
@mnzaki please review and merge