dev log
merged