more gravity to second level
solved conflict
solved conflict again