fix permissions
merge