This will create a conflict.  Also edited a statement.
Resolved conflict from last commit.