adding dates, class size
resolving merge conflict