touchups
fix conflict and gutter