removed merge residue
Merge branch 'master' of github.com:HEP-KBFI/stpol