Fixed merge (hopefully)