Last merge conflicts bugs resolved.