now working merge soon