Search Mouse, Edit mouse working
resolved conflicts