Change metadata

Ignore built help files in git
Solve merge conflict