merge with corrections