some changes..
변경
fixed conflict