Updated filmstrip generation and merging