Fix conflict text