forgot to commit after merge