Merge conflicts

app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt

@@ -22,10 +22,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.RequestManager
-<<<<<<< HEAD
 import xyz.quaver.pupil.BuildConfig
-=======
->>>>>>> origin/development
 
 class ThumbnailAdapter(private val glide: RequestManager, private val thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailAdapter.ViewHolder>() {
 
@@ -38,13 +35,10 @@ class ThumbnailAdapter(private val glide: RequestManager, private val thumbnails
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         glide
             .load(thumbnails[position])
-<<<<<<< HEAD
             .apply {
                 if (BuildConfig.CENSOR)
                     override(5, 8)
             }
-=======
->>>>>>> origin/development
             .into(holder.view)
     }