more styling
manual merging