Added solution after merge problems.