Fix for copy/paste mixup
Resolve merge issues