merge with adam