Add in CI and git merging