Now merge correctly. Stupid boy. Bump version