stop tracking bin activity that's causing merge conflict issues
merge
solve conflict issues
stop tracking bin-debug