Dev

Add requirements file, try to remove merge conflict potential