solve merge conflicts + #14946