codestyle/code formatting
conflicted file removed