premerge
merge theirs
fixed move fn issue