broken_fixies.txt keeps track of logs that cant be parsed
fixed conflicts