Merge in daniel