FUcking merge pajjar allt