everything untill merge