stupid merge issue