Unfortunately, after merging the release branches into master, we forgot to merge them into develop (actually, we do not forgot it, but thought that merging them in develop is not necessary). This caused the develop branch and the master branch to go out of sync for specific files. This was now resolved by merging the master branch into develop. All files should now be synced again and we won't make the same error again. Hopefully :)
Unfortunately, after merging the release branches into master, we forgot to merge them into develop (actually, we do not forgot it, but thought that merging them in develop is not necessary). This caused the develop branch and the master branch to go out of sync for specific files. This was now resolved by merging the master branch into develop. All files should now be synced again and we won't make the same error again. Hopefully :)