before merge from version with fit-hist
adding missing files
merging conflicts