interim styling
a fix for merge conflicts