some fixes
fixing merge conflict