fixed database lol not
fixat merge