Added user and org resource
changed conflicts