Resolved conflicts

src/main/java/net/gepafin/tendermanagement/service/UserService.java

@@ -49,4 +49,6 @@ public interface UserService {
     List<UserResponseBean> getAllUsers(HttpServletRequest request, List<Long> roleIds);
 
     PageableResponseBean<List<UserResponseBean>> getUserByPagination(HttpServletRequest request, UserPaginationRequestBean userPaginationRequestBean);
+    UserResponseBean updateUserDetails(HttpServletRequest request, Long userId, UpdateUserReqForBeneficiary userReq);
+
 }