I know because I merged both into a local branch, and had to resolve merge conflict