This is the second time I've tried to commit this scene and got a conflict. Martin fixed it the first time but, What an I doing wrong?

You're doing nothing wrong, Steve. My bad again this time. Email it to me and I'll take care of it. (Try committing your next assignment and you'll see that it will be alright.)

Are you sure it's not me? E-mail's on it's way!