Fixed dumb merging error