Merged Branches then resolved errors temporarily