Amy goes crazy
Amy fixing conflicts