checking for updates
fixing merge conflicts
fixing errors in concurrency