Fixed questionable merge

Fixed merge issues with "fixes"