heaps of new stuffs
merge conflict resolutions.
merge resolution