Minor styling tweaks
resolved conflicts