Merge changes from other copies of IDP