From 5e6e2cfc9eaa95f663450f5d85cec707da2eb8cb Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 23 Feb 2021 16:25:37 +0100
Subject: [PATCH] fix crash. Fixes #1493

---
 Habitica/res/layout/shop_header.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Habitica/res/layout/shop_header.xml b/Habitica/res/layout/shop_header.xml
index 1c7715334..4af51548f 100644
--- a/Habitica/res/layout/shop_header.xml
+++ b/Habitica/res/layout/shop_header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -39,4 +39,4 @@
         android:layout_marginBottom="4dp"
         style="@style/Body1"
         tools:text="Welcome to the Market! Stock up on new gear or buy rare eggs and potions. Check in periodically for new stock." />
-</merge>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file