Fixed error, something went wrong when merging

src/a2_starting_code/src/com/thelocalmarketplace/hardware/AttendantStation.java

@@ -96,7 +96,7 @@ public class AttendantStation {
 	 * @return true, if the indicated station was successfully removed from
 	 *             supervision; otherwise, false.
 	 */
-	public synchronized boolean remove(SelfCheckoutStationBronze station) {
+	public synchronized boolean remove(SelfCheckoutStation station) {
 		boolean result = supervisedStations.remove(station);
 
 		if(result) {