small changes
fix merge issues