Renaming things.
resolving conflicts