i also made changes
fixed conflict