fixed da
fixed merge