Grant permission to user on creation
Solve merge conflicts