Fixing returned conflict