fix slip gaji
merge