merge attempt no 2