initial commit
merge resolve
move complete