#22 Now merging triggers-database correctly