add lyk's file

add lyk's file
change merge file

change merge file