committing fucking everything instead of merging