Removed extra line in figure
Removed extra line
fixed merge conflict