Remove noconflict (unused, probably not necessary).
merge