Add include lost on merge