how to tie everything together (merge issues?!) MR?