fixes
conflicts fixed