Database calls working and merge conflict fixed