merge conflict with invoice UI