fixed: conflict would not load after last commit