* fix: now check for possible manual merges on our associated data.
0.3.1
Merge branch 'hotfix/tempAssociationWorkaround'