fixed merge  conflict