diff --git a/paddlers/custom_models/gan/__init__.py b/paddlers/custom_models/gan/__init__.py
index 49a16a7..4dec1be 100644
--- a/paddlers/custom_models/gan/__init__.py
+++ b/paddlers/custom_models/gan/__init__.py
@@ -11,8 +11,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<<<<<<< HEAD
 
 from .rcan_model import RCANModel
-=======
->>>>>>> 343f646f7dabf2ff08d80fab4ac5a37511260bd2