Updates to refs
Fix conflict