done security file
fix bug when merge