merge prepare
merged comments