Fix merge gone wrong