new content added to the top of the file, avoid merge conflicts