display: fix merge

Change-Id: I31cbbd41299db59961f015831644fa4c559af078