merged changes in subrepos