I dont know how to merge
Fixed conflicts