Fixed merge error in Prototyping