small changes
fixed confict by deleting dev log