removed errors due to merge failure