fixing conflict

fixing conflict