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]

Ok an update Going through the hex files generated by Keil, the last few lines are the only ones that seem to overlap.

Application last 4 lines :020000041000EA :0410140000C0030015 :04000005000180C1B5 :00000001FF

Bootloader last 4 lines :020000041000EA :0410140000C0030015 :040000050003C0C173 :00000001FF

As far as I can tell it is setting the EIP register to set where to start running after uploading. If I manualy go and remove the lines :020000041000EA :0410140000C0030015 :04000005000180C1B5 from the application hex file it then merges just fine. Is there a setting in keil so that i dont have to do it manualy.