Fix merge (again) and update to 0.2.5