log modify
fatal error modify
merging