update ignore
fixed some left merge problem