Solve this conflicts !!!