commit 333, confict??