I _think_ a rebase will help with that possibly.....