Merge aedict source code