fixed some issues in conflict solving methods and added tests
Added featuretype method in repo and tree objects

Added method to insert multiple feature instead of just one
added tests
fixed wrong constant value