This has nothing to do in this PR. Looks like you messed your different branches. Please always create your new branches based on the upstream master, not based on your previous feature branch