re-merge the full and readonly versions of relationship.js