Solve conflict under assets/