Added merge option to database diff tool