I've always found that the longer a feature branch is worked on separately from master, the merge back into master is that much more painful.