reverted files which where merged in a wrong way