fixing merge conflicts last change