New gallery and fixed merges