moving styles over for last push - fix conflict