some little stuff
fixed conflict
fixed