Fixed merge errer.