Changed stuff I think
?
Fixed merge conflict