if you feel like merge commits are "ugly" -- why do you feel that way? what's confusing about them? what tasks are harder to do? what questions are harder for you to answer? (I kind of feel confused about merge commits too and it's hard for me to explain why, I can definitely see that there are a lot of advantages to the merge workflow)