Please don't delete and copy your version. Please do a merge.