diff --git a/include/psp2/npdrm.h b/include/psp2/npdrm.h
index 35a036c98..d807e596f 100644
--- a/include/psp2/npdrm.h
+++ b/include/psp2/npdrm.h
@@ -74,19 +74,12 @@ int _sceNpDrmGetRifNameForInstall(char *rif_name, SceNpDrmLicense *rif_data, int
  *
  * @param[out] flags - License flags
  * 
-<<<<<<< HEAD
  * @param[out] exp_time - Expire times output
  * 
  * @return 0 on success, < 0 on error
 */
 int scePsmDrmGetRifKey(const ScePsmDrmLicense *license_buf, ScePsmDrmKeySet *keydata, int* flags, ScePsmDrmExpireTime* exp_time);
-=======
- * @param[out] exp_time  expire time output, [0] is start_date, [1] is end_date
- * 
- * @return 0 on success, < 0 on error
-*/
-int scePsmDrmGetRifKey(const ScePsmDrmLicense *license_buf, char *keydata, int* flags, SceUInt64 exp_time[2]);
->>>>>>> 3e22e49 (add missing arguments to scePsmDrmGetRifKey)
+
  
 #ifdef __cplusplus
 }