Merge conflict
Syntax
resolve MC locally; jsDoc