Revert "Fixed merging"

This reverts commit 8fc0ae79d4d5bcb23b6cb5e0299440554a48b5dc.
Revert "Merging Conflicts"

This reverts commit 36721f64e72276603a78ca1ddf887b8a5a2d754c.
Revert "Merging conflicts"

This reverts commit 4b9929ce0f2de6bdf14f579e6d395ddd958ea794.