more dev
merge issues