> There are conflict markers in the diff against trunk for this merge request.
>
> Those should be resolved.
>
>
> Merging trunk into the the branch and resolve conflicts before pushing branch
> again
>
>
> SYNONYM_STEM_X_CONCAT_SUBMITTED_WORDS should not be removed. Once you merge
> trunk and priya's schema updates, the test will pass for this.
SYNONYM_STEM_X_CONCAT_SUBMITTED_WORDS gets a conflict with my branch. I chose SYNONYM_STEM_X_SUBMITTED_WORDS as the name, which caused a conflict. I don't think he'll need to add it back in since when he merges with mine, it will give a conflict both ways.
> There are conflict markers in the diff against trunk for this merge request. STEM_X_ CONCAT_ SUBMITTED_ WORDS should not be removed. Once you merge
>
> Those should be resolved.
>
>
> Merging trunk into the the branch and resolve conflicts before pushing branch
> again
>
>
> SYNONYM_
> trunk and priya's schema updates, the test will pass for this.
SYNONYM_ STEM_X_ CONCAT_ SUBMITTED_ WORDS gets a conflict with my branch. I chose SYNONYM_ STEM_X_ SUBMITTED_ WORDS as the name, which caused a conflict. I don't think he'll need to add it back in since when he merges with mine, it will give a conflict both ways.