Removed errors caused by manual merging