bump minor version
fix conflicts