Fixed merging error

Change-Id: I18c619fbeeb7b0acb5a54a7cb21f824f44113e88