Version Bump
Resolving merge conflicts