fixed minor style issue
fixing conflic