Change conflicing shortcuts