notes
integration with app logic
three-way merging