fix conflict/ minor style