set permissions
fix merge