changed same line
merged changes