bugs fixes
conflicts