conflicts
fixed merge issues