Fixing the missed conflict