Revert "preparing to merge"

This reverts commit f13b24dd46cad3b39414481ac8440283a3a9c8eb.
Revert "removed conflictive files"

This reverts commit 4ec7118ad23288d476144dcf40a1032923939be8.