text is double, conflict resolved wrong?