merging
fixing tags/layering