Implemented turns
Fixed conflicts