Fixed the conflicts created by the fixed conflicts