XF 1.5 Merging help

[countryside]

Hi,
So after upgrading to XenForo 15.9 I have clicked on "Automatically Merge" and it merged a lot of my files, but I have three left. Do you know what will happen if do these, and which option I should pick for the first?


Thanks,
Noah

 

[Chris D]

This relates to a conflict between XF 1.5.9 and a custom style so you should contact the author of that style for support. It may be as simple as choosing one of the other or you may need to do some manual editing to get it looking correct in your custom style.