[Code Style] solving bad codestyle from merge conflicts