fixed merge errro