Fixed conflicts

Change-Id: If1b435b96e67b9b91f4573b10c42a94e50c41299