removed merge lines in db schema