fixed wrong merge (removed files readded)