Added calroute
Fixed mergeconfli