removed merge conflict

Change-Id: Id00b5ff4df2e2f52477ea72939931c5c4bf27669