Commit Merge Error Fixes
Double commit op

-Commited from GitHub GUI