resolved conflicts

src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java

@@ -23,4 +23,7 @@ public interface ApplicationRepository extends JpaRepository<ApplicationEntity,L
 	public List<ApplicationEntity> findByCallIdAndIsDeletedFalse(Long callId);
 
 	public List<ApplicationEntity> findByIsDeletedFalse();
+
+    public Optional<ApplicationEntity> findByIdAndUserIdAndIsDeletedFalse(Long id,Long userId);
+
 }