doing k12
merge fixed