Feature/work with mulltiple merge locations