some changes :/
fixed conflict