new entries in all files.
removed merge conflicts. Ignored auto-generated .el files