Finalized Debugging Merge Errors