conflicts string was wrong