reverted something...commiting to stay up to date
fixed conflicts. reverted to an earlier commit