resolve conflicts. hopefully :-D