fixing conflict commit