merge changes with infinality spec