recommendation complete
merged conflicts