removed extra line after merge conflict resolve