fixed merge conflict

src/app/pages/psicheckin/psicheckin.page.html

@@ -14,49 +14,7 @@
 </ion-header>
 
 <ion-content color="medium" scroll-y="false">
-      <ion-slides (ionSlideDidChange)="checkSelections()" pager="true" [options]="slideOpts">
-        <ion-slide>
-          <ion-card>
-            <ion-card-header>
-              <ion-card-title>
-                Which day would you like to configure?
-              </ion-card-title>
-            </ion-card-header>
-            <ion-card-content>
-              <h3>Please choose an option bellow</h3>
-              <ion-button [color]="allSelectionsCheckedToday ? 'success' : 'dark'" fill="outline"
-                          (click)="selectDay('today');goToSlide(1)">
-                Today
-                <ion-icon *ngIf="allSelectionsCheckedToday" name="checkmark"></ion-icon>
-              </ion-button>
-              <ion-button [color]="allSelectionsCheckedTomorrow ? 'success' : 'dark'" fill="outline"
-                          (click)="selectDay('tomorrow');goToSlide(1)">
-                Tomorrow
-                <ion-icon *ngIf="allSelectionsCheckedTomorrow" name="checkmark"></ion-icon>
-              </ion-button>
-            </ion-card-content>
-          </ion-card>
-        </ion-slide>
-        <ion-slide>
-          <ion-card>
-            <ion-card-header>
-              <ion-card-title>
-                How do you get to PSI?
-              </ion-card-title>
-              <ion-card-subtitle>
-                {{selectedDate | date}}
-              </ion-card-subtitle>
-            </ion-card-header>
-            <ion-card-content>
-              <h3>Please choose an option below</h3>
-              <ion-button fill="outline" color="dark" (click)="presentTransportModal()">by Bus
-              </ion-button>
-              <ion-button fill="outline" color="dark" (click)="goToSlide(2)">Other</ion-button>
-            </ion-card-content>
-          </ion-card>
-        </ion-slide>
-
-  <ion-slides (ionSlideDidChange)="checkSelections()" style="height: 100%" pager="true" [options]="slideOpts">
+  <ion-slides (ionSlideDidChange)="checkSelections()" pager="true" [options]="slideOpts">
     <ion-slide>
       <ion-card>
         <ion-card-header>
@@ -90,14 +48,13 @@
           </ion-card-subtitle>
         </ion-card-header>
         <ion-card-content>
-          <h3>Please choose an option bellow</h3>
-          <ion-button fill="outline" color="dark" (click)="presentTransportModal()">Public Transport
+          <h3>Please choose an option below</h3>
+          <ion-button fill="outline" color="dark" (click)="presentTransportModal()">by Bus
           </ion-button>
-          <ion-button fill="outline" color="dark" (click)="selectOther()">Other</ion-button>
+          <ion-button fill="outline" color="dark" (click)="selectOtherTransport()">Other</ion-button>
         </ion-card-content>
       </ion-card>
     </ion-slide>
-
     <ion-slide>
       <ion-card>
         <ion-card-header>

src/app/pages/psicheckin/psicheckin.page.ts

@@ -109,7 +109,7 @@ export class PsicheckinPage implements OnInit {
     }
   }
 
-  public selectOther(): void {
+  public selectOtherTransport(): void {
     this.transportService.selectOtherAsync(this.selectedDate)
       .then(_ => this.goToSlide(2))
       .catch(error => SoapApiHelper.handleError(this.toastController, error));