Fix merge conflict and built.