fucking hate git! almost killed my project...