do some changes local first
another change
rollback add of button 2
added picture
added image
added radio button
added check box
finished merge