tweaks
Fixed merge conflicts