merge fail fix