Resoove conflicts