feature #207: merging from tags