Local commit prior to pulling from remote
local merge
Fixed bug in bcd_testing