Fixing the merge issue

dunno why tho