Fixed Lucas' "conflict resolved"