clear conflicts

This reverts commit b5c360235e408f4c5417bb12ff20191588d1fc46.