fixed tons of conflicts