DManager Changes

implement findConflict
insert additional column file_state
implement state insertion
remove folder_insertion