Finished spawn state dialog
Very confused by merge conflict