Resolved conflict in data.sql. Closes #321.