Fixed auto merge error