Bootloader, Application, Softdevice 8.0 mergehex problem

[Nate]

When trying to merge the Bootloader, Application, Softdevice 8.0 together I keep getting the error "ERROR: The hex files cannot be merged since there are conflicts" (happens between the application and bootloader hex files)

As far as I can tell from the project settings I believe I should be ok. (See the picture below)

I am using pstorage in the app, could that be what is causing me problems?

Thanks

[Nate]

I did, basically the last lines of the app and bootloader where trying to write the same thing to the same place. So manually removing it from one of the files and then merging them worked. I wish I knew why it is doing that though. I have to do it every time I regenerate the files. See my first comment for how i did it.