fixing style overwrites
resolved conflict