fixing conflict 2