A little plugin to help you resolving this nasty conflicts.