2780 merge work isssue

https://code.google.com/p/otwarchive/issues/detail?id=2780