fixing conflict errors