fixed styles for excluding conflicts
Merge pull request #42 from InGo-LLP/76596684

big style fix