study page completed
merge resolved