Not sure why my merge won't work