fix: github messed up merging files