Add gallery view and add work view
Add merge