group and deadline manage page
merge conflicts