tweaks
Fix merge artifact