Fix merger remains

Fixed the remaining "<<<<<<" from merge