Move
Remove white space
Resolve conflict