started working on the red thread
fixed conflict