Small style tweaks
Fix conflicts