minor fix
conflict sovled