Resolving the conflicted issue