#39 Finished merging loadgame