removed merge errors

Change-Id: Icee5e86c2f95751276aadac4f9431ef05ab46f85