Resolving conflicts

Change-Id: If2c28558c902840ba6f0fc8e44e1066d65b60504