Bad merge! All is well now