fixing conflict fixes