fixing leftover conflict. changing final proj due time -Dave