hackathon things because merging