new patches
fixed conflict