modify resource file read
modify log
resolve conflict