Fix results styling
Fix merge conflict