merge changes to continue switch from attribute path to schema attribute path instance