Pulling in upstream changes
Merging new entries