Remove conflicted files. Tests seem stable.