Renaming, file conflict stuff (master-ready)