database corrected
merge conflicts solved