Tidied database entries
Fixed merge