Add relationship type model
Merge conflict