Set up commit
fixed titles and databases
confict fixed