Getting closer for merge branch