updated issues
updated issues
fix merge issues