Remove bad permission
Fix merge