Fix Merge Errors [2/2]