Fixed confliicts