I hope he changes his mind, or it blows over. Just try to make sure everything is neat and tidy, and don't give him any cause for complaining. Will your Mum back you up on this? Maybe you could explain how you feel to her privately, and let her talk to your step-Dad on your behalf?