Minor merge error in bin
Bump version, 1.2.1