ignoring db
merge with remote branch