fix navigate from invoice to list clients
fix merge conflicts