gits all messed up
merge conflicts resovled