Merge src_daex and src