remove the extra line to clean an error
Merge branch 'nate-master'