gui: fix bad merge

Change-Id: I67dc921a35e6dbc419bd9cfebcca66296b65d8e6
1 file changed