start working on gallery
solved conflict
still work on gallery