Conflict resolution
Comment out extra button states
Add form around buttons