diff --git a/app/src/main/java/com/h/pixeldroid/PostCreationActivity.kt b/app/src/main/java/com/h/pixeldroid/PostCreationActivity.kt
index c45e4f03..0702e0f8 100644
--- a/app/src/main/java/com/h/pixeldroid/PostCreationActivity.kt
+++ b/app/src/main/java/com/h/pixeldroid/PostCreationActivity.kt
@@ -42,13 +42,10 @@ class PostCreationActivity : AppCompatActivity() {
     private lateinit var pixelfedAPI: PixelfedAPI
     private lateinit var pictureFrame: ImageView
     private lateinit var image: File
-<<<<<<< Updated upstream
     private var user: UserDatabaseEntity? = null
 
     private var maxLength: Int = Instance.DEFAULT_MAX_TOOT_CHARS
-=======
     private var isSensitive = false
->>>>>>> Stashed changes
 
     private var description: String = ""