fixing that stupid merge issue