Fix merge conflict

Variable access was not correct