Remove merge conflict identifiers, correct nesting of for-loops