Trying to solve conflicts, feel free to revert