Fixed conflicts for now (while merging)