Resolving previous conflict