removed conflicts from merged