Merge pull request #990 from Jojo-Schmitz/check-for-merge-conflicts

check for merge conflicts
fix crash when loading 1.3 files with unknown style tags
fix: drum note entry using shortcut doesn't honor voice setting from drumset
fix #26591: Wrong clef / staff lines on MusicXML import
fix #25923
Fix regression on header/footer vertical position.

The Y offset parameter in header/footer textual styles no longer has any effect. As a consequence, header is always positioned at page top margin and footer at page bottom margin.

Fixed in Page::drawHeaderFooter() function.
Merge pull request #1004 from mgavioli/Header_footer_vert_pos

Fix regression on header/footer vertical position.
change text layout, use boundingRect() instead of tightBoundingRect()
fix #26741
SpannerMap key fix
Merge pull request #912 from vgstef/ContinuousPanel

Add continuous panel feature for continous view mode
Merge branch 'master' of github.com:musescore/MuseScore
update merge
cleaner implem. for reading ties
make enum class SegmentType a ": short"
convert enum Hidden into global enum class

after having seen how it is done in e1b1246
convert enum AlignmentFlag into enum class
small step further in converting enum Repeat into enum class

not there yet, as at least overloaded operators for |, &, |=, &= and ~ would be needed to make this fully working. And even then it'd require lots of explict casting. This is most probably not be worth the price...
convert enum ElementFlag into enum class
convert enum LayoutFlag into enum class