fixed merged compilation