Remove >>>>>> conflict text from CHANGELOG
Remove >>>>>> conflict text from CHANGELOG

makaroniame/makaroniame.github.io,makaroniame/makaroniame.github.io,makaroniame/makaroniame.github.io,makaroniame/makaroniame.github.io