removed end part
writer started
fixed merge conflict