Commit before further work and merge with game