[Git] Master branch bugged

[Nkmol]

It seems that the Master branch is not from the same git-flow as develop.
This results in duplicate commits in PRs (even though these commits already in the master), and in unnecessary conflicts.

This happened because the git was first created locally with a different master branch, the dev was created online.