level design a little bit

again
still the same merge errors again