updated timeline, time to merge