fixed errors caused with merging files previously