Resolved conflicts.  Closes #240