Fixes minor merge error