resolved conflicts and added alignment to questions view page