I made some changes
we fixed the merge problem