make things compile and run (fixed some merge problems)