JaromÃr MikeÅ¡ wrote: > Can someone advise me how to fix it pls? Do you have any patches applied? If yes, unapply them before attempting to merge the new upstream release. If this doesn't help, try calling "git checkout -- " on the files git complains about. - Fabian