created symbolic link
got file2 but conflicts