Fehler bei stash pop

resources/views/parts/searchbar.blade.php

@@ -5,14 +5,10 @@
 		<div class="searchbar {{$class or ''}}">
 			<div class="search-input-submit">
 				<div class="search-input">
-<<<<<<< Updated upstream
 					<input type="text" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" required="" @if($class=='startpage-searchbar') autofocus="" @endif autocomplete="{{$autocomplete or 'off'}}" class="form-control" placeholder="{{ trans('index.placeholder') }}">
-=======
-					<input type="text" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" required="" @if($class=='startpage-searchbar') autofocus="" @endif autocomplete="{{$autocomplete or 'off'}}" class="form-control" placeholder="{{ trans('index.placeholder') }}" tabindex="1" autofocus>
 					<button class="hidden" id="search-delete-btn" type="button">
 						<i class="fa fa-eraser" aria-hidden="true"></i>
 					</button>
->>>>>>> Stashed changes
 				</div>
 				<div class="search-submit" id="submit-inputgroup">
 					<button type="submit">