modofied a.logo
 both conflict lines added