F/merge proto fix