Bugs should be fixed.
Fixed the merge conflict.