attempt at fixing conflict