fixed version
bumped version
fix merge