Resolved conflicts at update
Ignoring database config file
Merge from origin