added bitcoin payment
error with merging