fix merge code
Merge branch 'master' of https://github.com/nambv/pnt_companny