Fix Merge Errors [1/2]