Removed confilct and updated dates.