Fixed build breaks caused by merge conflicts