Resource: Fix merge error

Change-Id: I7f899a4be12a0d9074e4c5921f5d44cd088de2d0