More Game Logic: Enter the merge conflictsgit add .