update manifest to enable rebase on master