cleaned up all conflicts of code