Added diagnosis page
Resovl conflicts