Edited something small stuffsy
Fixed a small merge conflict