use seed file with own files, fix last sunday method in company class
fix merge conflict