1c-merge conflicts fix