Resolv conflicts