Commit to revert
Resolving Errors
Fixed merge conflict