first commit redux
fix bad merge