get basic moving and merging working