added end turn functionality
fixed merge conflict
End turn mostly works