package org.usfirst.frc.team6027.robot;

import edu.wpi.first.wpilibj.Joystick;
import edu.wpi.first.wpilibj.buttons.Button;
import edu.wpi.first.wpilibj.buttons.JoystickButton;
import org.usfirst.frc.team6027.robot.commands.Aim;

public class OI {
	private Joystick stick = new Joystick(0);
	Button trigger = new JoystickButton(stick, 1);
	public OI(){
		trigger.whenActive(new Aim());
	}
	public Joystick getJoystick(){
		return stick;
	}
}

@@ -293,23 +293,19 @@
 %09Button 
-trigger
+aim
  = new J
@@ -349,15 +349,11 @@
 %7B%0A%09%09
-trigger
+aim
 .whe

Rename to avoid conflict