fixed conflict. Added cool awesome stage1 to world1.