fix
add 4 merge
fix confict