small conflict fix
update conflits and database connector