scene 2 fixed
merge