removed useless lines
merge conflict