* refactor: Rename trunk and branch to parent1 and parent2

* refactor: Minor fixes

* refactor: Update packr file

* refactor: Rename trunk/branch in tools api handlers