Merge keyboard + upgrade unity 4.2