merge conflicts resolved..back to normal