diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index 3f0530e82fb..d2bc3b37183 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -236,11 +236,7 @@ function tax_by_date($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 	$total_localtax1='total_localtax1';
 	$total_localtax2='total_localtax2';
 
-<<<<<<< HEAD
     // CAS DES BIENS/PRODUITS
-=======
-    // CAS DES BIENS
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 
     // Define sql request
     $sql='';
diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php
index 0122dbc3eaf..c0d411a9e47 100644
--- a/htdocs/dav/dav.class.php
+++ b/htdocs/dav/dav.class.php
@@ -23,10 +23,8 @@
 
 
 /**
- * Define Common function to access calendar items
- * And format it in vCalendar
- * */
-
+ * Define Common function to access calendar items and format it in vCalendar
+ */
 class CdavLib
 {
 
@@ -46,8 +44,9 @@ class CdavLib
 	/**
 	 * Base sql request for calendar events
 	 *
-	 * @param int calendar user id
-	 * @param int actioncomm object id
+	 * @param 	int 		$calid 			Calendard id
+	 * @param 	int|boolean	$oid			Oid
+	 * @param	int|boolean	$ouri			Ouri
 	 * @return string
 	 */
 	public function getSqlCalEvents($calid, $oid=false, $ouri=false)
@@ -113,7 +112,8 @@ class CdavLib
 	/**
 	 * Convert calendar row to VCalendar string
 	 *
-	 * @param row object
+	 * @param 	int		$calid		Calendar id
+	 * @param	Object	$obj		Object id
 	 * @return string
 	 */
 	public function toVCalendar($calid, $obj)
@@ -239,11 +239,17 @@ class CdavLib
 		return $caldata;
 	}
 
+	/**
+	 * getFullCalendarObjects
+	 *
+	 * @param int	 	$calendarId			Calendar id
+	 * @param int		$bCalendarData		Add calendar data
+	 * @return array|string[][]|unknown[][]|NULL[][]
+	 */
 	public function getFullCalendarObjects($calendarId, $bCalendarData)
 	{
-
 		$calid = ($calendarId*1);
-		$calevents = [] ;
+		$calevents = array();
 
 		if(! $this->user->rights->agenda->myactions->read)
 			return $calevents;