Bills - fixed merge error