Fix notice after conflict