added gameplay
resolved conflicts