Updates and merges