diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9c3cf77..ae194c9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,7 +2,6 @@ name: Build C++
 
 on:
   merge:
-    branches: [ main ]
   pull_request:
     branches: [ main ]
 
diff --git a/main.cpp b/main.cpp
index 4249ac6..5f6db4e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,23 +5,28 @@ using std::cout, std::cin, std::endl, std::string, std::vector, std::getline;
 
 int main(){
   string input = "";
-  vector<string> list;
+  vector<string> favorites;
 
   do{
-    if( list.size() == 0 ){
+    if( favorites.size() == 0 ){
       cout << "What is your favorite?\n";
     }
     else{
       cout << "What is your next favorite?\n";
     }
+<<<<<<< HEAD
     getline(cin, input);
     if (input != "done")
     	list.push_back(input);
+=======
+    cin >> input;
+    favorites.push_back(input);
+>>>>>>> refs/remotes/origin/main
   }while( input != "done" );
 
   cout << "Your favorite list:\n";
-  for(int i = 0; i < list.size(); i++){
-    cout << list.at(i) << endl;
+  for(int i = 0; i < favorites.size(); i++){
+    cout << favorites.at(i) << endl;
   }
 
   return 0;