merge chris's files