Bump v2.1.0
Fix conflicts