fix conflict
Merge pull request #60 from ParagonDevelopmentTeam/sync

sync to pioneer