button is weird
resolving conflict