Resolved conflicts

src/main/java/net/gepafin/tendermanagement/service/impl/CallServiceImpl.java

@@ -50,7 +50,7 @@ public class CallServiceImpl implements CallService {
     		UpdateCallRequestStep1 updateCallRequest) {
     	UserEntity user = validator.validateUser(request);
     	CallEntity call = validator.validateUserWithCall(user, callId);
-    	return callDao.updateCallStep1(call, updateCallRequest, user);
+    	return callDao.updateCallStep1(request,call, updateCallRequest, user);
     }
     @Override
     @Transactional(readOnly = true)