perform merges on correct thread
added contexts subspec