Report question

Question: How do you handle the tension between refactoring and the need for merging?