Hi everyone, I recently upgraded to Mendix 10, and I've encountered an issue that wasn't present in previous versions. Every time I merge from another branch, I experience conflicts specifically in the navigation. This never used to happen before the upgrade. Could anyone provide insights into why this is happening in Mendix 10? Are there any significant changes in the navigation structure or merge algorithm in Mendix 10 that could be causing these conflicts? Has anyone else experienced similar issues, and how did you resolve them? Are there best practices or tools that can help minimize or resolve these conflicts efficiently? Any help or guidance would be greatly appreciated! Thank you!