fixed merging

Change-Id: Id4cd00c9e40f7fc37f53a382ef97386e60351875