Commit to resolve conflicts.
Merge branch 'structalign' of https://github.com/statalign/statalign.git into structalign