More fixing of merge? issues