updating versions and fixing merge issues with the master