getting close
issues persist with merge :(