Use tabs
Added conflict report and unit tests