some fixes
conflicts