Resolved users conflict while merging
Roles access and permission changes