replaces placeholder
commit before pull
fixes merge conflicts
seeds db