frog and movement added
resolved conflicts