Add construction preset
Smarter tag conflict merging (fixes #943)