Fix allow
merge