fixed an error caused by a misplaced relation annotation
Merge branch 'commentFeature'