Fixed conflict in functions file