Follow up patch, removing missed conflict marker