merged shit
removed files