force checkout to avoid merge error