fixed merging error, never manually