I get 2 merge conflicts in both configure_general.cpp and configure_general.ui. From what I understand, both screen layout and language options occupy the same position in the configure window and I have to edit the code to accommodate for both. In configure_general.ui the horizontallayout_7 is for both options. I'm not sure what you rename one of them. You mind posting a screenshot of the configure window in citra with both options.The only conflict is that both commits introduce a new QHBoxLayout in src/citra_qt/configure_general.ui with the same name (horizontalLayout_7). Just rename one of those and it merges without conflicts. Thats just a naming issue, it doesn't affect any code.