add magnet item(not finished)
fix conflicts