correct merge conflict

Change-Id: I57011b01162302db587c681ccff87af57889bbee