solved compilation problems resulting from merge