minor fix
merged conflicts