merge
added 2nd player