not completely hideous styling
fixed merge conflict