Fixing ugly merge issue