fixed mergefail in bootstrap