reversing changes
fixed merging error