Fix conflict base marker highlighting