added deleted property to files API
resolved conflicts