* Manifest file
* Some stuff
* Merge conflict