Added mergeconflicts.txt file to lombardo branch