header issue fixed
widget fixed
merge fix