Removed merge markings and formatted the code.