fixed errors introduced while merging