From lx05
fixed local confilcts