manual conflict override