bootstrap modified
include schema.rb in version control
merge conflicts