fixing merge2
merge issues