fixed conflict.

fixed conflict on bluebee2082014.sql