merge
main time line almost done