cleaing up a merging mistake