Fixed merge mistake and added character database sql