new folder and changes one file
resolve the confilict