diff --git a/doc/lightning-listpays.7 b/doc/lightning-listpays.7
index 4d1eaf8e84a5..c8c0021a22a8 100644
--- a/doc/lightning-listpays.7
+++ b/doc/lightning-listpays.7
@@ -3,12 +3,13 @@
 lightning-listpays - Command for querying payment status
 .SH SYNOPSIS
 
-\fBlistpays\fR [bolt11] [payment_hash]
+\fBlistpays\fR [bolt11] [payment_hash] [status]
 
 .SH DESCRIPTION
 
 The \fBlistpay\fR RPC command gets the status of all \fIpay\fR commands, or a
 single one if either \fIbolt11\fR or \fIpayment_hash\fR was specified\.
+It is possible filter the payments also by status\.
 
 .SH RETURN VALUE
 
@@ -74,4 +75,4 @@ Rusty Russell \fI<rusty@rustcorp.com.au\fR> is mainly responsible\.
 
 Main web site: \fIhttps://github.com/ElementsProject/lightning\fR
 
-\" SHA256STAMP:9b593ed02c10b34ae6f36f91963da0a244df0c3963aaa990e7477008fd3af18d
+\" SHA256STAMP:4cea0f219c2a99fed2db9b95ec4f0210ed4dfa903660849c74238b25d45a637a
diff --git a/doc/lightning-listpays.7.md b/doc/lightning-listpays.7.md
index 788570ba086e..19982dc575fa 100644
--- a/doc/lightning-listpays.7.md
+++ b/doc/lightning-listpays.7.md
@@ -4,13 +4,14 @@ lightning-listpays -- Command for querying payment status
 SYNOPSIS
 --------
 
-**listpays** \[bolt11\] \[payment_hash\]
+**listpays** \[bolt11\] \[payment_hash\] \[status\]
 
 DESCRIPTION
 -----------
 
 The **listpay** RPC command gets the status of all *pay* commands, or a
 single one if either *bolt11* or *payment_hash* was specified.
+It is possible filter the payments also by status.
 
 RETURN VALUE
 ------------
diff --git a/wallet/db_postgres_sqlgen.c b/wallet/db_postgres_sqlgen.c
index 81526a30fcea..c1c4fc4feab2 100644
--- a/wallet/db_postgres_sqlgen.c
+++ b/wallet/db_postgres_sqlgen.c
@@ -2038,12 +2038,4 @@ struct db_query db_postgres_queries[] = {
 
 #endif /* LIGHTNINGD_WALLET_GEN_DB_POSTGRES */
 
-<<<<<<< refs/remotes/ElementsProject/master
-<<<<<<< refs/remotes/ElementsProject/master
-// SHA256STAMP:6353b67b3e4f539da2d1f0c2564c4a8243f07d59cd0b73bc83d5552600bd67f7
-=======
-// SHA256STAMP:b5f4c156aa7e336af86f98eafc5e198d3653ff27b21d861a5e777645bf6d89ec
->>>>>>> rpc: Integrate the status flow in the listsendpays command
-=======
-// SHA256STAMP:2af9ace16d4db060e649c3e078271504fce5a7c5661a25464a551aa7cc7029d0
->>>>>>> wallet db: Support the query on database with status and payment hash.
+// SHA256STAMP:c08699eae7d8de418f7b197aad5682203ebbae633ce8888b9b4797a2db8ce106
diff --git a/wallet/db_sqlite3_sqlgen.c b/wallet/db_sqlite3_sqlgen.c
index 2d4fa80ba839..6077d017752d 100644
--- a/wallet/db_sqlite3_sqlgen.c
+++ b/wallet/db_sqlite3_sqlgen.c
@@ -2038,12 +2038,4 @@ struct db_query db_sqlite3_queries[] = {
 
 #endif /* LIGHTNINGD_WALLET_GEN_DB_SQLITE3 */
 
-<<<<<<< refs/remotes/ElementsProject/master
-<<<<<<< refs/remotes/ElementsProject/master
-// SHA256STAMP:6353b67b3e4f539da2d1f0c2564c4a8243f07d59cd0b73bc83d5552600bd67f7
-=======
-// SHA256STAMP:b5f4c156aa7e336af86f98eafc5e198d3653ff27b21d861a5e777645bf6d89ec
->>>>>>> rpc: Integrate the status flow in the listsendpays command
-=======
-// SHA256STAMP:2af9ace16d4db060e649c3e078271504fce5a7c5661a25464a551aa7cc7029d0
->>>>>>> wallet db: Support the query on database with status and payment hash.
+// SHA256STAMP:c08699eae7d8de418f7b197aad5682203ebbae633ce8888b9b4797a2db8ce106
diff --git a/wallet/statements_gettextgen.po b/wallet/statements_gettextgen.po
index fb91647de0a5..7b88db302a9c 100644
--- a/wallet/statements_gettextgen.po
+++ b/wallet/statements_gettextgen.po
@@ -1345,12 +1345,4 @@ msgstr ""
 #: wallet/test/run-wallet.c:1696
 msgid "INSERT INTO channels (id) VALUES (1);"
 msgstr ""
-<<<<<<< refs/remotes/ElementsProject/master
-<<<<<<< refs/remotes/ElementsProject/master
-#  SHA256STAMP:e203d19d9f4192ad6b3aa1a6f257d4f7b267df56c5de9810b573f0affa0122fd
-=======
-#  SHA256STAMP:e074dc48b7055c740baa4da907a743baf1048d03dca12ebd1ed5989a9b0b7549
->>>>>>> rpc: Integrate the status flow in the listsendpays command
-=======
-#  SHA256STAMP:697c27016716f435d1ecb4ec3fca117316f779d88c02dbde7ea3214b4bc0a2c7
->>>>>>> wallet db: Support the query on database with status and payment hash.
+#  SHA256STAMP:de612e43f4a76fed487047d802d20cc7185cf5650ed31bc01efb89c495bfbb14