fix bug, get thematic
Resolve merge conflict