please solve conflicts