fixed merges and tryed to add blending mode