Erik tweaks
Merge resolution