before merge
merged conflict resolved