merge from hadi and resolve conflict in log_book.txt