Restart functionality
Merge using theirs