Bump version
Solved conflicts