Fix conflict format error