After Fixing the conflict