merge fixes for relationships