added bitcoin pricing
fixed merge conflicts