merge with local repo
changes for easier include child