Git merging hacky thing