commit after resolving bugs