tryies resolve conflicts