automerge: cf0f740e -s ours * commit 'cf0f740e': If no display settings are matched, return the first one. DO NOT MERGE