There shouldn't necessarily be any merge conflicts if you branch the cleanup branch off of your feature branch. So, it might look like this:

  -master---------------*--------------------*--
    \-feature-branch---/                    /
                      \-cleanup-branch-----/