minor style fix
merged conflicts