Removed traces of conflict, added <main>