* Feat: started adding conflict checls

* Feat: finished BranchConflicting function

* Fix: fixed bugs in BranchesConflicting

* Feat: InheritBranches now checks conflicts

* Feat: completed AddBranch method

* Feat: refactored InheritBranches

* Refactor: refactored AddBranch

* Feat: started implementing objectstorage in branchmanager

* Refactor: refactored Parse functions

* Feat: added KeyPartitions to branchmanager objectstorage

* Refactor: refactored some code

* Feat: added events to Branch

* Refactor: refactored event logic

* Refactor: removed unnecessary code

* Refactor: replaced events with manager based implementation

* Refactor: refactored branchmanager to update branches

* Feat: removed unused property

* Refactor: removed unused method (fork does everything)

* Refactor: commit before branch change

* Feat: added a method to update the parent branch

* Feat: added SetModified in models

* Feat: completed different logics

* Feat: added ability to uncolor coins

* Refactor: refactored some code + comments

* Refactor: renamed ancestor to descendant :P

* adds comments from meeting (#411)

* Refactor: refactored some last stuff before merge

* Feat: updated to latest hive.go

* Feat: updated hive.go in tester

Co-authored-by: Luca Moser <moser.luca@gmail.com>