Update app.py

Removed merge conflict

app.py

@@ -5,12 +5,9 @@ import matplotlib.pyplot as plt
 import io
 from model import load_model, get_val_transform  # Import functions from model.py
 import numpy as np
-<<<<<<< HEAD
-=======
 
 # Load the model on GPU if available
 model = load_model(device=0 if torch.cuda.is_available() else -1)
->>>>>>> 16e22fbe27ebb36b6090c462c63a4d127310b2b8
 
 val_transform = get_val_transform()