Fixed merge (hopefully did it correctly)