Fix conflicts and c99 compile compatible