Fix freakin Conflicts