finall fix git merge fail