Repairing build after merge
Completed repair to build after merge