changes
fixed merge issues