Join exp and start

Hopefully fixed all the merge problems from yesterday