New feature: Check if the master and develop branches are not conflicting

  * This prevents errors if multiple remotes with the branch are present