Fix conflict shortcuts