dog check in/out of park working
fix merge conflict