iss7: got rid of double underline and testing if merge conflicts will come #21

Closed urvishp13 closed 10 months ago