Merge permission fix