Fixed the contractController merge error