Vignette and some collision refinement
Merge conflict resolution