fixed camera during state transitions
fix merge conflicts