fixing conflict...