Changelog error

Hi, I currently made a mistake in my site by changing modules of place. The page was working fine after that, but when I desactivated the advance forum module, the site didn't load anymore and says there is a server problem.

When I go to the server and replace changes with commits it says it is not possible due to a conflict with advance forum changelog. Anyone has an idea on how to solve this?

I am not sure if the issue is posted in the correct place and I appologize if so.

please help!!!