animation, year, color legend added
resolve conflictins